Crazy restructure of our entire repo