-> Refactoring: Changed the package structure to make it consistent with the texture packages and have a more logical layout