Make package structure consistent across cwm modules

```
There are a few inconsistencies in the structure, such as the use of "model" 
for data classes (should be reserved for wicket Models), and the presence or 
absence of "cwm" in the package name.  Need to do some refactoring.

```

Original issue reported on code.google.com by `bgoldow...@gmail.com` on 30 Aug 2011 at 2:08
