Add common and include folder