Final reorganization

for now