Move classes into SRC