Refactor

Renell Castro (rmc424)requested to merge
refactor into master

Refactored/formatted code as well as remove unnecessary tags, organize directories, etc

Merge request reports