Addded Shape class
Changed directory structure