Merged most of the classes form both projects