refactored folder structure
refactored again