Refactored options into separate file.
Added FOLDER properties.