Code Overhaul, tidied up directories and code.