Move everything from lib to app