Re-organizing
Removed code to orig/ thats not very complete
Saved current state of files