Clean up structure and create setup script. Closed #4
Merge branch 'develop'