Create Better Organization for parsing