Remove deprecated files
Add all layout components