renamed files, commented code and refactored