Added Package for Part Two, Renamed Classes for better project structure