Even more moving of files. Removed lots of cyclic problems. Only a few more to go.