Change project structure
Merge pull request #5 from online-dj/develop

Change project structure