Changed class structure
File structure, etc.