Adding folders; Setting up calculator project;
Updating calculator source;
Merging class source