code reorg & namespace change
Merge pull request #27 from SuperstarDonkeyJockey/ugc

code reorg & namespace change