File organisation

Rearrange som of the files to a clearer structure