Made some changes so the packages has the same name as the project