moved user folder
minor refactoring and cleanup