updated package name, moved directories