Merge pull request #56 from xuy/master

Remove print statements from the code, tests output is cleaner
Moved user-related files to a separate folder