Changing generic name to meaningful file name

Needs constructors and a whole lot of work done still.