More consistency in package names and directories