refactored folder structure