Project restructure

resolves #10