Fix package statements

BlueJ keeps writing needless package statements to files and it's kind of bothersome.