Updating code, splitting files