fixed refactoring - moving directories