move to new directory structures with proper package names