Refactor move files to src directory