Changed the file structure.
Merged prev changes.
Fixed as jshint says.