options: adding type and defaults
fix: syntax error
misc cleanup
bootstrap: reorganizing directories