Refactoring

Scrolls in separate source

Objects in separate source