refactoring resources structure for cleaner use