Updated structure - folders change