Uodated with latest directory struct. @jecovier will update sources.
Updated with latest directory structure. @jecovier will update with 2014 code versioning.