Revert 1642efc..206c7c5

This rolls back to commit 1642efc9e14927310a7fe4ea8890091d89a73161.
Added /lib to gitignore
Revert d3c6a6d..50db95f

This rolls back to commit d3c6a6d4359a86324e0fa3fcfb90692705fda1b2.
Added /lib to gitignore
Library cleanup, path updates, ant build updates
Library cleanup, path updates, ant build updates