Moved to new directory and refactored.
Old files deleted.