Add logging  + refactor resources folder structure