slight rearrangement

reorganization, puts original files from template into different file