Changed package name + lot of other things