restructurize folders and update libs