correct file & dir structure without imports