Updating refactoring and cleared out unused files
Merge pull request #3 from MICC/f/refactoring

Updating refactoring and cleared out unused files