201308121706 Reorganize for proper maven compile