Removed unused files
Merged Calculator with remote changes