more reshuffling of files - more sane now?