Remove useless file
Change layout (a bunch)