startup and directory organization enhancements