folders refactoring and misc clean-up