moving blueprints and mixins into their own subdirectories and refactoring to pull them in more generically