Moving source into separate folder