Changed folder structure

Preparing for a somewhat-big overhaul of code