Better ScaleType demo and some order into project