Move patterns into relevant subdirectories
Added/updated some new pattern types
Modified basically all of it