Changed package names to reflect code structure and make consistent
Further changes to code structure
Removing old, unused logo file