Reorganized to include console project