Merged projects together. Added new classes and assets.