Changed the project name and organised the files a bit