Refactor deeply nested packages. Match filesystem layout with package names