Organised imports and formatted all java files, fixes gh-23