Moved lib to app