Mojito Project Arcitechture Changes