Fixed all problems

Fixed all occuring problems after the renaming and reupload