Revert file structure, Added service page