repo restructured and minor fix