new per user src structure; code cleanup