Update and restructure the course program

- Moving things around