Moved App outside of lib