source files separation. now. really.