Altered project structure, update version, tidied project