Updated requirements
Restructured project