Refactor directory handling
Welcome message modified.