Removed the old packages and included src/java/org/ameer to get the files ready for apache maven.