Well , Re-mapped classes into different files

Well , Re-mapped classes into different files