Fixed Directory Organization

index file, deleted extra folders, etc.