Changed file hierarchy to make everything cleaner
Changed file hierarchy to make everything cleaner