Restructured projects, added aggregator project