folder layout refacored