Cleaned up errors (package/namespaces)

Fixed package, import, and some other things to get rid of errors in
Eclipse.