Updated some files to get a cleaner Eclipse import