Refactor Resources and add remote module