Model
-Added Circles Class
-Edited some variable naming and method naming

Overall
-Grouped class together to their package accordingly. e.g. shapes,lines in model…
-deleted some unnecessary testing files

**I think use this version of file and keep doing updating in these files bah.