Deleted unused files and refactored Main Activity