Updating structure to match psr-0 requirements