Refactoring. Removed dead folders and formatted code.