more file reorganization
cleaning up stuff