Remove unneeded folder
Add fixes and updates for options parsing