removed directories & renamed things