Renamed packages
Initial sepatation of GUI