Reworked course
Delete old structure