Changed back to default structure. Seemed more logical