v0.7 restructure and ant build file