Reorganisation of file structure

No code changes just a re-laying out of file structures and names.