Updates based on issue #4
Restructuring