Rearrange files and switch to OASIS

Signed-off-by: John Else <john.else@citrix.com>
Merge pull request #2 from johnelse/oasis

Rearrange files and switch to OASIS