Reworked SRC files