renaming/moving stuff as i please