Change project structure
Update readme
Change setupscript to reflect changes in project structure