Restructured into top + senior + junior templates and progress on
implementing junior one