make folder and package names consistent