Overhaul project structure to resemble organization in luthor branch