moved .aspx files to correct directory

not sure how to merge appdata..they seem to be almost the same, except
the version in the master is larger. I just left it.