Restructured directory layout. closes #14
fixed base_dir
Merge github.com:fsr-itse/1327