more cleanup

@ussuri 

Little more cleanup with package location and some missing styling.