Dirctory structure fixed