Moving classes out of top level, things were getting crowded

Change-Id: I955b899229793e4e5d604562d24d939e1781b864