revised naming and class structure of all files