start cleaning up sources a bit
clean up/re-organize sources

Now all user profile stuff is in one place.