Added src and test directories