cleaned up optimisation
moved big files