Fixing compilation errors

Changed package statements to be consistent, and moved "lib" folder to
"libs" because "lib" is apparently incompatible with the new version of
ADT.