Removed unnecessary tuning libraries and reorganized existing libraries