Refactoring files
Add general.js