Working refactored code
Moved files around