Began refactoring part.
More refactoring
Removed files that shouldn't be there