Iss45

Update Iss45 branch with new project structure.