Removed unneeded files. Refactored code.