Refactored folder structure - updated