Changed source structure to better reflect the heirarchy.