remove mixin pattern and split extra files