Removed some unnecessary files and refactoring some code.