Removed _old folder and fixed the source files