restructuring

closes #4