corrected folder layout