Updated manifest and project folder structure