Consolidate exercise into single files