Fixed file structure inside jar and removed res from test classpath