Correcting identetation and adding serial numbers
Merging some classes