Modularize the code base for real this time. Github For Windows is weird and doing stupid shit.