Rename to flaws and reform to package