fixing names and organization
Cleaned up export macro to be simpler.
Fixed win32 projects.