Added src and test packages