Refactored projects, fixed build