Organized the project a bit
Merge pull request #1 from Tonkpils/organizing

Organize project structure a bit for sanity