UI, and some data constructs added
changed package structure