Restructured module and updated examples to reflect restructing