removed and moved some directories