tidied up directory.  Most things in correct places now.