Refactoring of project structure; added ScrollContainer and -view