folder cleanup

...and a bit of method refactoring