Added multiple source files to make code more compact