Restructured directory layout. closes #14