Finish adding all tracking and template file to main folder