change the structur and update libs