Project Structure Cleanup

Added build.xml, moved around files and packages.