move imports and mixins up on folder level to match less structure