Better layout of the project, soursemaps works, some typo fix.