Revert "Revert "Organized the locations of files""

This reverts commit 516391590008ed01c3dc0e5b2859cb8d72e5961a.