[WIP] Modifying the manifest to follow module best practices