Add Crypto and reorganise folders