Moved filename stuff around