Changed project layout (closes #20)