Restructure and cleanup
Merge pull request #2 from Zammalad/master

Restructure and cleanup