tidied up folders/code