Project completely refactored!