[TASK] Move more files to modern-style locations.