Move deps to subdir
Simplify makefile
Migrate to using (probably better) string manipulation