reorganized lib into main folder