Updated package structure, moved classes out of helloworld package