refactoring out some needless directories
updating directories