4.4 BETA

Reorganised folder structure