Changed some names, organization arround