Refactored Classes / Names, removed dummy project