tidying up folder layout

tidying up the location of files (was a bit of a mess)