Update Iss45 branch

Update Iss45 branch with new structure from master