Fixed some files and added new Package