Added some dependencies moved the src tree to a directory