File structure re-naming... not much.. not much.