More package refactoring and apperance changes