Refactoring Solution, merged all modules to a single project