Redesigned and cleaned up directory structures