Getting rid of the two-layered package structure. This is a temporary commit.