Corrected folder strukture