Moved files to src directory