Added original code and some new files