* renamed components and moved depracated ones to another folder