refactored folder structure
saved solution