Project structure and file names changed to follow new guidelines