Initial commit of new folder organization (openwind)
Resolving merge conflicts (added error checks)