Remove tools we don't use much and flatten the project a bit