changed around directory structure