Simplify default directory structure