move page stuff into a dir, add some more functions to User