L010104 Separated code to .h and .cpp files