Update to manifest ver. 2 + tidy up structure.