Get fix for mobile, reorganize and push