separated axis, layer stuff into different packages
7 files changed