Re-organized profiles. Fixed issue with invalid characters in filenames. Related to issue #1.