Made some changes to the file strucutre for better consistency between projects.