Reorganize some files; fix name generation button