Separate app and lib directory and create two add commands