Working out the folders

## v0.1.0105
## for ticket #1