Change directory structure
Renamings to fix imports