reorganize resources folder a bit
reorganize resources folder a bit
a bit of whitespaces and pep formatting
more whitespaces cleanup
update tests