updated naming conventions and packages