Adjusted code
Removed misc. files
Tidying up
Transition to different base files
Commited changes made while off the internet