Fixed messed up directory structure/package names.