So close to having a clean structure!
Removed old file
Added page template