directory refactoring
troubleshooting