Moved files to src dir