Merged new of not-jay
Deleted unnecessary files
Correct some errors