Added missing init files and changed some stuff