Removed some very old code. Moved the new code into the base directory