Doing some cleanup, renaming... RAWRRRR

Still not done mom :(