house cleaning and reorg
making things less dependent on specific file structure (but more to do)