Remove redundant files
Major refactoring and styling