Working on user file support

Minor code and module refactoring