Remove dependency on folder structure
Add missing libraries