Made it work with folders (still need to rename the namespaces on the darwin classes that were moved)