Removed Unrelated Code; Moved Code

Code is now in src/ not src/Commons