Initial commit

Convert code of the initial app to the new app