closes #5
restructure