Refactored folder structure for states