Cleaning up subdirectory creation process

## v0.1.0109
## for ticket #1