refactored to get rid of entry class
removed the extra entry related files and more improvements