re-orged into standardized directories