refactored file layouts