Fix outputs
Reorganize folder structure