31: Added seperate code for API 11.  Sorted code into new folders and packages. Cleaned up code.