Add more files
Fix requiring of nested depedencies
Add tests