REFACTORING  I

- divided into packets
- deleted some unecessary classes