Integration of new file structure for pi tag