Tidying up

Tidied up + support for folders