Minor report work
Report refactoring

Establishing links between sub folders etc.