Adding app/ and lib/ folders