irefactored the directory structure