Moved app files to lib