refactored folder structure, feature based