Refactoring

started on steven's comments by removing unused/unneeded files and reformatting some white space