File reorganization and first cut at parsing Options from file