Reworked files into to correct folders