Moved files into public