removed unused dirs
refactored