Changed src structure to match other projects. Fixed ant build
Merge branch 'core-refactor' of github.com:webdetails/cpf into core-refactor