Revert back last changes and move code to our app