fixing folder structure and removing lib path