Changes to structure & a fix

Changed the structure of the file & fixed the Angle() method.