Improve resources directory structure