filesystem refactoring/cleanup