made directory structure nicer