Moving file locations to match template repository

Moving some files to different locations in the file structure and making the corresponding changes for the import statements.

The change of locations is to match the Tests file structure that will be added to Finding Dory