UPDATE reorganization of the entire folder system
Some minor changes to code