Changing directory structures. Still need to generate autodependencies