Renamed some modules + Code clean up
Updated UI