Fixed major compile/make issues
Major breakup of files, again