Added pattern files, more structure