Modified Kernel code
Moved includes to new class 'Common' that will hold generic functions and includes.