More work on folders structure
More cleanup