restructure folder, add custom tag to support long to date conversion