Refactor resourcable module
Merge