Added correct app code and adjusted libraries to new names