Restructure of files

Changed/created some files, project should now be more organized.