Moved main file
Major reorg, split the files up properly