Moved all the files to the correct package