Refactor to single entity file
Fix filename in package
clean up