fix folder structure
fix reqs
remove conflicting module
remove conflicting module
remove files