refactored directory structures for simplicity