Change dir structure, remove dependencies.