Revamped the manifest and modules to be cleaner and remove unneeded packages