CLEANUP: Restructured into vector, col/row, and internal files.