Fixed Eclipse buildpaths and changed package names