Removed duplicate import of mixins and moved imports to separate sections