Update requirements
Restructure app