Fixing package declarations, added a couple more files from before