Tried fixing the structure, but am missing some files...