more incluseion refactoring and support for file store; some work on mimeextension and getting main exec to work