re-aligned directory structure