Update

Remove useless stuff. Restructure