new folder structure for data
server changes for updated dir structure
add external dir to build