simplification and refactoring

split out axes into their own directives