Corrected general structure, folders, and parser