Simplify the file stucture. Upgrade all libs.