New year's cleaning special

I've been cleaning the repository, moving stuff where they should be etc. This structure is hopefully more intuitive and more easy to understand.