structural changes for sanity's sake; added CWAC-Camera to libs
adding ideas
merging in changes from Evan