moved everything out of UserArea subdir, for use with git