refactored directories
almost done refactoring
final refactoring