Refactored code into directories
Removed old code