Pfoti/rearrange files

Includes all previous changes + sets up proper file structure.