Improved Folder.__str__()
Rearrangd the code layout a bit.
A quick and dirty test suite to aid in development