actually fixed directory structure this time