Reorganization

Should be easier to find things, I think.