Separated files now buildable, untested