Clean up structure and create setup script. Closed #4