Changed folder structure

blame Eugen if you hate it ;) :octopus: