Initial commit
Small restructuring and adding stub files
Uh, all kinds of stuff.
Fixing merge issues