update
optimized directory structure