Further reorg

Most stuff should now have find a cozy place.