Move some files into engine package

so as to not litter main application pacakge with files