Cleanup project structure
Update readme
Merge branch 'project_structure'