Did a ton of refactoring
Cleaned up directory from unused files