Refactored Project, placed old files in depracated folder