Moved _s files into it's own folder