Change naming and remove manifest files for extends and mixins