fixed package name and moved some source files around.