Updated directory structure and separated gyps
Did it some more...