refactored User and config files