Add missing requirements
Reorganise directory structure