Merge "snapuserd: Refactor code to a seperate directory"