Re-organizing some parts and some rifles