Reorganisation. Please work

The organisation of the project was fucked. This hopes to fix that. I'll get it working myself.