Fixing this dependency nonsense
Refactoring
Add readme