Got rid of sub-packages
Ran autoformat