Worked on implementing new UI look and changed package hierarchy