move bin/ data/ under app/
remove old lib/
adjust paths as needed