Moved user files under user folder to create a better hierarchy of files
Added file picker button
Merge branch 'redesign'