Restructured files and added build.xml for ant