Directory structure refactored -- split into original/derived/generated