moved non-pages to libs