refactoring & directory clean-up