rearranged file layout, tidied up