Merge feature/relooking to master, rename deps