Moving files under proper subdirectory