Moving everying to src