Reorganizing folders and new program