Simple file reorganization to be more standard