move things around
rename some stuff