Changed Class structure to psr0