more folder structure updates
formatting