Refactored UI so it is less monolithic
Renamed package and removed unused entry class