Refactor dirs

Merge current refactor folder/settings changes