Created better structure