Added FileMap
Some changes
Tabs converted to spaces
Removed test folder
Some fix
Errors now cause termination in batch mode
Removed internal annotations
Minor fixes
Merge remote-tracking branch 'origin/filemap'