Version
Simplify file structure
Update requirements