Added common and test directories