Added necessary files and directories to follow roxy model. Merged chang...

...es from Matthew Whitehart.