Cleaned up code a bit, and added ant build files

Change-Id: Ic6a765d54d345ae171ca5548364eb475f5b0ff85