Reorganize resources, fix code. CS is done for 1.5 :)