Another file reorg. Unit Tests now working.
Starting API updates.
Merge branch 'master' of https://github.com/jfox015/Serenity