Reordering files to prevent build error

Sorry, this was an embarassing error..

The deprecated code uses the mixins which are @imported **after** .  This cases errors on build.