Updating source folders hierachy and adding tests' source folder