New mobile first structure, cleaned up lib list