Switch structure to atomic design