Renamed app
Moved variables