try to clean up name display, put files in folders instead of home dir