Cleaning up compiler; Adding import statements and package headers appropriately...