Restructure repo for clarity