Commented out some debug code and moved libraries to "lib" package