renamed some type constructors to have consistent naming in the project
moved scene related stuff to own module