Simplified code + some CS fixes

Aleksander Machniak

2015-05-14 044c1a052381d73a75a998af604bfd84b949d702

../../program/resources does not exist in tree 0f847ebe792b2513519607b9c5669c6b154df9d2