Refactor of edu-apps.org