Reorganize X classes structure and file naming convention