Changed directory layout.

closes #10