Removed unnecessary ant targets, more package refactoring